change type of local "image" variable from GtkImage to GtkWidget to fix

2008-06-13  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkaction.c (gtk_action_set_short_label): change type of
	local "image" variable from GtkImage to GtkWidget to fix warning.

svn path=/trunk/; revision=20373

diff --git a/ChangeLog b/ChangeLog
index 46b53386d928f33f7dd23e49c3c7bce4696a6791..0bf7fc4b1b1a7bdcf3603317c390cbf23526a1fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-13  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkaction.c (gtk_action_set_short_label): change type of
+       local "image" variable from GtkImage to GtkWidget to fix warning.
+
 2008-06-13  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_menu_position): cast menu's

diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 08047f105f25e4ea4557b3503f479123efb0b378..fc9f5c21bfe70d40d081b8de7ece580ea4d0469f 100644 (file)
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -1385,19 +1385,20 @@ gtk_action_set_short_label (GtkAction   *action,
       proxy = (GtkWidget *)p->data;
 
       if (GTK_IS_TOOL_BUTTON (proxy))
-       gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy), 
+       gtk_tool_button_set_label (GTK_TOOL_BUTTON (proxy),
                                   action->private_data->short_label);
       else if (GTK_IS_BUTTON (proxy) &&
               !gtk_button_get_use_stock (GTK_BUTTON (proxy)))
        {
-         GtkImage *image;
+         GtkWidget *image;
+
          child = GTK_BIN (proxy)->child;
 
          image = gtk_button_get_image (GTK_BUTTON (proxy));
-         
+
          if (GTK_IS_IMAGE (image) ||
              child == NULL || GTK_IS_LABEL (child))
-           gtk_button_set_label (GTK_BUTTON (proxy), 
+           gtk_button_set_label (GTK_BUTTON (proxy),
                                  action->private_data->short_label);
        }
     }